Revert 503cae2..b4213de

This rolls back to commit 503cae289ad5693ab448a3e70cc61037ace02863.