Revert 992fab5..7f8ac12

This rolls back to commit 992fab5c7ee586387add3a663b38edf5a44c44d5.