Revert dd8fbbb..bafd4d5

This rolls back to commit dd8fbbb0a24e2a9fc8f6c2711d443e10e085d452.