Revert b95595b..b0a8a18

This rolls back to commit b95595b68546c284c91c1845297434f5f76d5e7a.