Revert 956d583..cd44ae2

This rolls back to commit 956d5831a8bf1bdc19d9cceeaf8969c5553cad50.