Revert 7aaaf07..45aefac

This rolls back to commit 7aaaf0710df451447d901fcc7adb802b7d7b9323.