Revert ffecec5..c02b7c3

This rolls back to commit ffecec59f648d26531c2cca0a983eaf84dd4b9c6.