Revert 56ce201..96a94ec

This rolls back to commit 56ce201a67d899469d0e2c94884e3e38302ec1ac.