Revert 047df5e..67fa843

This rolls back to commit 047df5ecbdd36d2a52a55063b28b82b51752e1b3.