Revert 565a44b..30b3305

This rolls back to commit 565a44b87525126d73b2b0a68f1c6f9fbf1be182.
Resolve conflict