Revert 5676f46..dd92c3e

This rolls back to commit 5676f4640100c84b657a979f7321c39117b5cbba.