Revert 15c8613..a663633

This rolls back to commit 15c8613333be3c716894a53fcd6795e36531f769.