Revert 8aabc70..7856c6e

This rolls back to commit 8aabc70b15c777fc649dc0b27b8eeb1b78d98bd0.