Revert f20d607..5ac7fb0

This rolls back to commit f20d607e5895aa3722f8ca001b0a1e0e8e7fc67b.