Revert cec9a72..d8bf025

This rolls back to commit cec9a72bb2298f5593c591e06da9456157569382.