Revert 7ea706a..e3fbcec

This rolls back to commit 7ea706a05af124802a4d6bbd3c3c8eba35165fc8.