Revert 6c59165..484e97b

This rolls back to commit 6c59165fe8b87e66d7a8d15b215b56be13c63fc4.