Revert 0b4c778..3bbc6f3

This rolls back to commit 0b4c778926f7de546bdcf252e7f74cc64fe65bac.