Revert 68eb7f2..23c0485

This rolls back to commit 68eb7f230ebff4769359dba85a5602857344c6f3.