Revert 506f4f7..bf7fecf

This rolls back to commit 506f4f78cb978023f84315a6c059f26134a11688.