Revert b6f4179..bf6afaa

This rolls back to commit b6f417968a839c36e8f98ff5dc839f0190955c94.