Revert 5225b19..034d267

This rolls back to commit 5225b19980be8c88d74ef10a11ff59f4e6255cdb.