Revert 5faf64f..4939685

This rolls back to commit 5faf64f9e73b105ce84327601bebd34d09da990e.