Revert b30f23d..7a59fbd

This rolls back to commit b30f23dac9fb6b8876d7f11661a0f52830dca8d8.