Revert 710fa3b..dbf93a2

This rolls back to commit 710fa3b074021a4a956497c46d06ca2da4a1b068.