Revert 7f17a4c..516780c

This rolls back to commit 7f17a4c8910d5cad4ae9547e608c61ca653a2bb1.