Revert 50939c0..e0a6a2a

This rolls back to commit 50939c050d7b9f99d333914f43ed645bdfb3bb80.