Revert 94641ec..a4bb6b7

This rolls back to commit 94641ec6138361d5e40eee162fa001d4a27d0471.