Semi-reverted to buildable version.