Revert 943b2c3..b8c46e2

This rolls back to commit 943b2c3bdbed9c521fb45430d63a76d4337c59d5.