Revert 5caa123..47914b6

This rolls back to commit 5caa1233538023485740693e7aac215cb54c9b09.