Revert f2174a3..e47e553

This rolls back to commit f2174a3227d15099fae31558edeb752b73190b49.