Revert 71454f0..7ed629c

This rolls back to commit 71454f0207d40569a6fe6d7254f71a22d7c5b4d8.