Revert 2cfa75b..b3c5a4d

This rolls back to commit 2cfa75b976e1aeb174db2ca0cf8694fd9657ee9f.