Revert 5a0eb17..eb32eff

This rolls back to commit 5a0eb17e54c60dbcf4cce31d1ea430170e91e264.
rebuild