Revert a3b2dd4..ed0291f

This rolls back to commit a3b2dd45cd333b6b5a271a68c49a2500e79a096e.