Revert 2dc2fcb..e14843f

This rolls back to commit 2dc2fcb32199b83a0059ff85d584e14d4cc4deea.