Revert b242c64..24db744

This rolls back to commit b242c64fef7e2413c75df1b441d9b51c8bdafddd.