Revert 3faae8f..5e3cfa0

This rolls back to commit 3faae8f675c24a905df9f169ca1e48ee4522164e.