Revert ded06a0..2cbf5d1

This rolls back to commit ded06a067ae0f2c59d1a283b17d0274ef79b0336.