Revert 5339bb3..d42c83b

This rolls back to commit 5339bb38e8866265b51edbee246a112314b6e18d.