Revert 381f8d9..4baff4c

This rolls back to commit 381f8d94d3ca6a085bfec43ccc731b4112de4488.