Revert 1a3b12f..fa1575d

This rolls back to commit 1a3b12fba69c97de53004b6f1eabdbe8f430abe7.