Revert 4964dae..606132f

This rolls back to commit 4964daea879fc80a97c7e2efd34c84a4e0a02519.