Revert 59dcebe..543614e

This rolls back to commit 59dcebeab3a2063ca89e4d3ea7992cebd0ebaedc.