Revert 454d58b..249de10

This rolls back to commit 454d58b0941a5d41d22f5dbb10caa94ce63683cc.