Revert 835b735..10ae937

This rolls back to commit 835b735980d04ce4f4aefc4c121acab5df322d15.
attempt to restore