Revert 4420dd4..3e83e96

This rolls back to commit 4420dd4f88d5fde6d8ae18d4b7ef2919c97b58b0.