Revert 7314e84..73c4b12

This rolls back to commit 7314e841f28dd250d6c0a6826734e6ee31a6263a.