Revert 6b5abd4..b1c81f5

This rolls back to commit 6b5abd44d4228b7a210f422d93773c6bd4f07096.