Revert 0cafe1a..a47df0a

This rolls back to commit 0cafe1aa593e084897bc2b8d6e8d8d72c11b5fc9.
g