Revert 6f4f45d..b0742b3

This rolls back to commit 6f4f45df645b6b87c293a86bb93cf5cee721d7ba.