Revert 871d99c..9f5b1f5

This rolls back to commit 871d99cb16eb3e99d0eae6f75c07130f2a071be0.