Revert ec82bcb..f13dd5f

This rolls back to commit ec82bcb08a09d1ba4b119ccf3838830edd131d40.