Revert 7cdeab7..41b49cf

This rolls back to commit 7cdeab761bbcd17517565a4eb9eb865052d3fed0.