Revert f7644b5..1403be3

This rolls back to commit f7644b55ab1287d02fc77ff7d01af475d62fa513.