Revert 76b3199..0015b45

This rolls back to commit 76b31993aac3d0a0e899d994055916f366857008.