Revert "Revert "Revert a06c769..a924c85""

This reverts commit ee1e53ab099d251e01eba4853e92155aa7597e6e.
Revert 0be599e..eb6343b

This rolls back to commit 0be599e46e304743416eab5844dc409ff04965ea.