Revert 6753a7f..652a7d0

This rolls back to commit 6753a7f48814db3fb379bf447e7eab5dde277053.