Revert 5e0ce2f..4fd1ab7

This rolls back to commit 5e0ce2ff383c47cb4023884d4e4d9a7fe7bc116c.