Revert 84f7890..0cf2304

This rolls back to commit 84f7890c4fd1a105adaa341370509b410fcf6963.