Revert 9064f16..9fe8a37

This rolls back to commit 9064f1684d498eba1ec104747a766ee0f9222f44.