Temporary rollback due to bugs