Revert 60d5344..30ce2ee

This rolls back to commit 60d53441c0baac7fb702a57807e8526748f48c1b.