Revert 34d3c5a..74dba42

This rolls back to commit 34d3c5ae5e88595c73c4def7e388dbdf9f7448fa.