Revert f56ca59..19fb3f0

This rolls back to commit f56ca59663c83a1fdb984fe4b1a3145f7452e49d.