Add a hidden -disable-pre flag for testing purposes. This should be removed