Revert 77fd6cc..a7b3015

This rolls back to commit 77fd6cca96fb7423d88a20b3ce5e46e6741f5da6.