Revert 47ac2c1..f526dff

This rolls back to commit 47ac2c12cfe73d313ce68e4277d8cd07bfca58ea.