Revert 8a340df..b54dc38

This rolls back to commit 8a340df3d97824ed618c2e4c74f94d932aa9f62f.