Revert 11a349f..4e868d0

This rolls back to commit 11a349f41e7a6dc3b54df7042ce8fbf3d3c268f6.