Revert 2338b6f..857c9ec

This rolls back to commit 2338b6f5529ec9e8d57aefe0c6a74b7ce03b026e.